Merge changes from emacs-23
authorChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:47:22 +0000 (14:47 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:47:22 +0000 (14:47 -0400)
commit8ef35e4c0855e932e387c72ddc5fed0338c6d250
tree0f57e856b2bb81541c8bb866defb11eef6db2f05
parent9d2c9984d94ff22382959acc12c55b29eca33306
parentfbc09d981cf0cbd6f322b4761cac335e95e87fa9
Merge changes from emacs-23